Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2011 02:19:34 +0000 (19:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2011 02:19:34 +0000 (19:19 -0700)
commit999b5ecfddc7b442a23d8618195b67303b33d141
tree687b3b12760ec62bf5866db20404a364e1b839ad
parentf643a17df7e99293d62167bd1ec65b78990e7008
parent992d4d7eee6086b250391c9d266571770112a4a0
Merge from trunk.
13 files changed:
src/ChangeLog
src/alloc.c
src/bidi.c
src/callproc.c
src/dispextern.h
src/emacs.c
src/gtkutil.c
src/image.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/xdisp.c
src/xterm.c